From: Fomafix <fomafix@googlemail.com>
Date: Sun, 21 Jan 2018 13:54:14 +0000 (+0100)
Subject: mediawiki.special.upload: Use mediawiki.api.parse
X-Git-Tag: 1.31.0-rc.0~841^2
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=100e5bc580199ffc87ee210853efbd649da86eca;p=lhc%2Fweb%2Fwiklou.git

mediawiki.special.upload: Use mediawiki.api.parse

This also adds the parameter contentmodel=wikitext to the API request.
This ensures that the text is always parsed as wikitext, even with a
title with a different content model like 'MediaWiki:Common.js'.

Change-Id: I29f0c76c3354a8c97b8296224e14341f71726c2f
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 109ab7d6f0..0e9ab18619 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2208,6 +2208,7 @@ return [
 			'jquery.spinner',
 			'mediawiki.jqueryMsg',
 			'mediawiki.api',
+			'mediawiki.api.parse',
 			'mediawiki.libs.jpegmeta',
 			'mediawiki.Title',
 			'mediawiki.util',
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js
index 9bf62558dd..0c3eb21328 100644
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@ -134,10 +134,7 @@
 
 			$spinner = $.createSpinner().insertAfter( $element );
 
-			( new mw.Api() ).get( {
-				formatversion: 2,
-				action: 'parse',
-				text: '{{' + template + '}}',
+			( new mw.Api() ).parse( '{{' + template + '}}', {
 				title: $( '#wpDestFile' ).val() || 'File:Sample.jpg',
 				prop: 'text',
 				pst: true,
@@ -150,7 +147,7 @@
 		},
 
 		processResult: function ( result, template, $previewContainer ) {
-			this.responseCache[ template ] = result.parse.text;
+			this.responseCache[ template ] = result;
 			this.showPreview( this.responseCache[ template ], $previewContainer );
 		},